From 134556435d361ef370399ab9f7bf64c497464ae6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 4 Oct 2016 12:50:56 +0200 Subject: [PATCH] Remove various deprecated GtkOrientable subclasses --- docs/reference/gtk/gtk4-sections.txt | 179 --------------------------- gtk/deprecated/Makefile.inc | 26 +--- gtk/deprecated/gtkhbbox.c | 89 ------------- gtk/deprecated/gtkhbbox.h | 66 ---------- gtk/deprecated/gtkhpaned.c | 73 ----------- gtk/deprecated/gtkhpaned.h | 65 ---------- gtk/deprecated/gtkhscale.c | 141 --------------------- gtk/deprecated/gtkhscale.h | 69 ----------- gtk/deprecated/gtkhscrollbar.c | 88 ------------- gtk/deprecated/gtkhscrollbar.h | 65 ---------- gtk/deprecated/gtkhseparator.c | 78 ------------ gtk/deprecated/gtkhseparator.h | 65 ---------- gtk/deprecated/gtkvbbox.c | 87 ------------- gtk/deprecated/gtkvbbox.h | 65 ---------- gtk/deprecated/gtkvpaned.c | 73 ----------- gtk/deprecated/gtkvpaned.h | 65 ---------- gtk/deprecated/gtkvscale.c | 138 --------------------- gtk/deprecated/gtkvscale.h | 75 ----------- gtk/deprecated/gtkvscrollbar.c | 87 ------------- gtk/deprecated/gtkvscrollbar.h | 71 ----------- gtk/deprecated/gtkvseparator.c | 73 ----------- gtk/deprecated/gtkvseparator.h | 71 ----------- gtk/gtk.h | 11 -- testsuite/gtk/builder.c | 58 ++++----- 24 files changed, 32 insertions(+), 1846 deletions(-) delete mode 100644 gtk/deprecated/gtkhbbox.c delete mode 100644 gtk/deprecated/gtkhbbox.h delete mode 100644 gtk/deprecated/gtkhpaned.c delete mode 100644 gtk/deprecated/gtkhpaned.h delete mode 100644 gtk/deprecated/gtkhscale.c delete mode 100644 gtk/deprecated/gtkhscale.h delete mode 100644 gtk/deprecated/gtkhscrollbar.c delete mode 100644 gtk/deprecated/gtkhscrollbar.h delete mode 100644 gtk/deprecated/gtkhseparator.c delete mode 100644 gtk/deprecated/gtkhseparator.h delete mode 100644 gtk/deprecated/gtkvbbox.c delete mode 100644 gtk/deprecated/gtkvbbox.h delete mode 100644 gtk/deprecated/gtkvpaned.c delete mode 100644 gtk/deprecated/gtkvpaned.h delete mode 100644 gtk/deprecated/gtkvscale.c delete mode 100644 gtk/deprecated/gtkvscale.h delete mode 100644 gtk/deprecated/gtkvscrollbar.c delete mode 100644 gtk/deprecated/gtkvscrollbar.h delete mode 100644 gtk/deprecated/gtkvseparator.c delete mode 100644 gtk/deprecated/gtkvseparator.h diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index ddf80a22c0..09293bdf03 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1689,87 +1689,6 @@ GtkFramePrivate gtk_frame_get_type -
-gtkhbbox -GtkHButtonBox -GtkHButtonBox -gtk_hbutton_box_new - -GTK_HBUTTON_BOX -GTK_IS_HBUTTON_BOX -GTK_TYPE_HBUTTON_BOX -GTK_HBUTTON_BOX_CLASS -GTK_IS_HBUTTON_BOX_CLASS -GTK_HBUTTON_BOX_GET_CLASS - -gtk_hbutton_box_get_type -
- -
-gtkhpaned -GtkHPaned -GtkHPaned -gtk_hpaned_new - -GTK_HPANED -GTK_IS_HPANED -GTK_TYPE_HPANED -GTK_HPANED_CLASS -GTK_IS_HPANED_CLASS -GTK_HPANED_GET_CLASS - -gtk_hpaned_get_type -
- -
-gtkhscale -GtkHScale -GtkHScale -gtk_hscale_new -gtk_hscale_new_with_range - -GTK_HSCALE -GTK_IS_HSCALE -GTK_TYPE_HSCALE -GTK_HSCALE_CLASS -GTK_IS_HSCALE_CLASS -GTK_HSCALE_GET_CLASS - -gtk_hscale_get_type -
- -
-gtkhscrollbar -GtkHScrollbar -GtkHScrollbar -gtk_hscrollbar_new - -GTK_HSCROLLBAR -GTK_IS_HSCROLLBAR -GTK_TYPE_HSCROLLBAR -GTK_HSCROLLBAR_CLASS -GTK_IS_HSCROLLBAR_CLASS -GTK_HSCROLLBAR_GET_CLASS - -gtk_hscrollbar_get_type -
- -
-gtkhseparator -GtkHSeparator -GtkHSeparator -gtk_hseparator_new - -GTK_HSEPARATOR -GTK_IS_HSEPARATOR -GTK_TYPE_HSEPARATOR -GTK_HSEPARATOR_CLASS -GTK_IS_HSEPARATOR_CLASS -GTK_HSEPARATOR_GET_CLASS - -gtk_hseparator_get_type -
-
gtkiconview GtkIconView @@ -5108,38 +5027,6 @@ GtkListStorePrivate gtk_list_store_get_type
-
-gtkvbbox -GtkVButtonBox -GtkVButtonBox -gtk_vbutton_box_new - -GTK_VBUTTON_BOX -GTK_IS_VBUTTON_BOX -GTK_TYPE_VBUTTON_BOX -GTK_VBUTTON_BOX_CLASS -GTK_IS_VBUTTON_BOX_CLASS -GTK_VBUTTON_BOX_GET_CLASS - -gtk_vbutton_box_get_type -
- -
-gtkvbox -GtkVBox -GtkVBox -gtk_vbox_new - -GTK_VBOX -GTK_IS_VBOX -GTK_TYPE_VBOX -GTK_VBOX_CLASS -GTK_IS_VBOX_CLASS -GTK_VBOX_GET_CLASS - -gtk_vbox_get_type -
-
gtkviewport GtkViewport @@ -5182,72 +5069,6 @@ GTK_VOLUME_BUTTON_GET_CLASS gtk_volume_button_get_type
-
-gtkvpaned -GtkVPaned -GtkVPaned -gtk_vpaned_new - -GTK_VPANED -GTK_IS_VPANED -GTK_TYPE_VPANED -GTK_VPANED_CLASS -GTK_IS_VPANED_CLASS -GTK_VPANED_GET_CLASS - -gtk_vpaned_get_type -GtkPanedPrivate -
- -
-gtkvscale -GtkVScale -GtkVScale -gtk_vscale_new -gtk_vscale_new_with_range - -GTK_VSCALE -GTK_IS_VSCALE -GTK_TYPE_VSCALE -GTK_VSCALE_CLASS -GTK_IS_VSCALE_CLASS -GTK_VSCALE_GET_CLASS - -gtk_vscale_get_type -
- -
-gtkvscrollbar -GtkVScrollbar -GtkVScrollbar -gtk_vscrollbar_new - -GTK_VSCROLLBAR -GTK_IS_VSCROLLBAR -GTK_TYPE_VSCROLLBAR -GTK_VSCROLLBAR_CLASS -GTK_IS_VSCROLLBAR_CLASS -GTK_VSCROLLBAR_GET_CLASS - -gtk_vscrollbar_get_type -
- -
-gtkvseparator -GtkVSeparator -GtkVSeparator -gtk_vseparator_new - -GTK_VSEPARATOR -GTK_IS_VSEPARATOR -GTK_TYPE_VSEPARATOR -GTK_VSEPARATOR_CLASS -GTK_IS_VSEPARATOR_CLASS -GTK_VSEPARATOR_GET_CLASS - -gtk_vseparator_get_type -
-
gtkwidget GtkWidget diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index ac9af6e702..d0755d407f 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -4,11 +4,6 @@ deprecated_h_sources = \ deprecated/gtkactiongroup.h \ deprecated/gtkalignment.h \ deprecated/gtkgradient.h \ - deprecated/gtkhbbox.h \ - deprecated/gtkhpaned.h \ - deprecated/gtkhscale.h \ - deprecated/gtkhscrollbar.h \ - deprecated/gtkhseparator.h \ deprecated/gtkhsv.h \ deprecated/gtkiconfactory.h \ deprecated/gtkradioaction.h \ @@ -19,13 +14,7 @@ deprecated_h_sources = \ deprecated/gtktable.h \ deprecated/gtkthemingengine.h \ deprecated/gtktoggleaction.h \ - deprecated/gtkuimanager.h \ - deprecated/gtkvbbox.h \ - deprecated/gtkvbox.h \ - deprecated/gtkvscale.h \ - deprecated/gtkvscrollbar.h \ - deprecated/gtkvseparator.h \ - deprecated/gtkvpaned.h + deprecated/gtkuimanager.h deprecated_private_h_sources = \ deprecated/gtkgradientprivate.h \ @@ -39,11 +28,6 @@ deprecated_c_sources = \ deprecated/gtkactiongroup.c \ deprecated/gtkalignment.c \ deprecated/gtkgradient.c \ - deprecated/gtkhbbox.c \ - deprecated/gtkhpaned.c \ - deprecated/gtkhscale.c \ - deprecated/gtkhscrollbar.c \ - deprecated/gtkhseparator.c \ deprecated/gtkhsv.c \ deprecated/gtkiconfactory.c \ deprecated/gtkradioaction.c \ @@ -54,10 +38,4 @@ deprecated_c_sources = \ deprecated/gtktable.c \ deprecated/gtkthemingengine.c \ deprecated/gtktoggleaction.c \ - deprecated/gtkuimanager.c \ - deprecated/gtkvbbox.c \ - deprecated/gtkvbox.c \ - deprecated/gtkvscale.c \ - deprecated/gtkvscrollbar.c \ - deprecated/gtkvseparator.c \ - deprecated/gtkvpaned.c + deprecated/gtkuimanager.c diff --git a/gtk/deprecated/gtkhbbox.c b/gtk/deprecated/gtkhbbox.c deleted file mode 100644 index 9d119fedb3..0000000000 --- a/gtk/deprecated/gtkhbbox.c +++ /dev/null @@ -1,89 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkhbbox.h" -#include "gtkorientable.h" -#include "gtkintl.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkhbbox - * @Short_description: A container for arranging buttons horizontally - * @Title: GtkHButtonBox - * @See_also: #GtkBox, #GtkButtonBox, #GtkVButtonBox - * - * A button box should be used to provide a consistent layout of buttons - * throughout your application. The layout/spacing can be altered by the - * programmer, or if desired, by the user to alter the “feel” of a - * program to a small degree. - * - * A #GtkHButtonBox is created with gtk_hbutton_box_new(). Buttons are - * packed into a button box the same way widgets are added to any other - * container, using gtk_container_add(). You can also use - * gtk_box_pack_start() or gtk_box_pack_end(), but for button boxes both - * these functions work just like gtk_container_add(), ie., they pack the - * button in a way that depends on the current layout style and on - * whether the button has had gtk_button_box_set_child_secondary() called - * on it. - * - * The spacing between buttons can be set with gtk_box_set_spacing(). The - * arrangement and layout of the buttons can be changed with - * gtk_button_box_set_layout(). - * - * GtkHButtonBox has been deprecated, use #GtkButtonBox instead. - */ - - -G_DEFINE_TYPE (GtkHButtonBox, gtk_hbutton_box, GTK_TYPE_BUTTON_BOX) - -static void -gtk_hbutton_box_class_init (GtkHButtonBoxClass *class) -{ -} - -static void -gtk_hbutton_box_init (GtkHButtonBox *hbutton_box) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (hbutton_box), - GTK_ORIENTATION_HORIZONTAL); -} - -/** - * gtk_hbutton_box_new: - * - * Creates a new horizontal button box. - * - * Returns: a new button box #GtkWidget. - * - * Deprecated: 3.2: Use gtk_button_box_new() with %GTK_ORIENTATION_HORIZONTAL instead - */ -GtkWidget * -gtk_hbutton_box_new (void) -{ - return g_object_new (GTK_TYPE_HBUTTON_BOX, NULL); -} - diff --git a/gtk/deprecated/gtkhbbox.h b/gtk/deprecated/gtkhbbox.h deleted file mode 100644 index 168ce153e8..0000000000 --- a/gtk/deprecated/gtkhbbox.h +++ /dev/null @@ -1,66 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_HBUTTON_BOX_H__ -#define __GTK_HBUTTON_BOX_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - - -G_BEGIN_DECLS - -#define GTK_TYPE_HBUTTON_BOX (gtk_hbutton_box_get_type ()) -#define GTK_HBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox)) -#define GTK_HBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass)) -#define GTK_IS_HBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HBUTTON_BOX)) -#define GTK_IS_HBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBUTTON_BOX)) -#define GTK_HBUTTON_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass)) - - -typedef struct _GtkHButtonBox GtkHButtonBox; -typedef struct _GtkHButtonBoxClass GtkHButtonBoxClass; - -struct _GtkHButtonBox -{ - GtkButtonBox button_box; -}; - -struct _GtkHButtonBoxClass -{ - GtkButtonBoxClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_hbutton_box_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new) -GtkWidget* gtk_hbutton_box_new (void); - -G_END_DECLS - -#endif /* __GTK_HBUTTON_BOX_H__ */ diff --git a/gtk/deprecated/gtkhpaned.c b/gtk/deprecated/gtkhpaned.c deleted file mode 100644 index 64272bc406..0000000000 --- a/gtk/deprecated/gtkhpaned.c +++ /dev/null @@ -1,73 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkhpaned.h" -#include "gtkorientable.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkhpaned - * @Short_description: A container with two panes arranged horizontally - * @Title: GtkHPaned - * - * The HPaned widget is a container widget with two - * children arranged horizontally. The division between - * the two panes is adjustable by the user by dragging - * a handle. See #GtkPaned for details. - * - * GtkHPaned has been deprecated, use #GtkPaned instead. - */ - - -G_DEFINE_TYPE (GtkHPaned, gtk_hpaned, GTK_TYPE_PANED) - -static void -gtk_hpaned_class_init (GtkHPanedClass *class) -{ -} - -static void -gtk_hpaned_init (GtkHPaned *hpaned) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (hpaned), - GTK_ORIENTATION_HORIZONTAL); -} - -/** - * gtk_hpaned_new: - * - * Create a new #GtkHPaned - * - * Returns: the new #GtkHPaned - * - * Deprecated: 3.2: Use gtk_paned_new() with %GTK_ORIENTATION_HORIZONTAL instead - */ -GtkWidget * -gtk_hpaned_new (void) -{ - return g_object_new (GTK_TYPE_HPANED, NULL); -} diff --git a/gtk/deprecated/gtkhpaned.h b/gtk/deprecated/gtkhpaned.h deleted file mode 100644 index 44c1d40b26..0000000000 --- a/gtk/deprecated/gtkhpaned.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_HPANED_H__ -#define __GTK_HPANED_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_HPANED (gtk_hpaned_get_type ()) -#define GTK_HPANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned)) -#define GTK_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass)) -#define GTK_IS_HPANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HPANED)) -#define GTK_IS_HPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED)) -#define GTK_HPANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass)) - - -typedef struct _GtkHPaned GtkHPaned; -typedef struct _GtkHPanedClass GtkHPanedClass; - -struct _GtkHPaned -{ - GtkPaned paned; -}; - -struct _GtkHPanedClass -{ - GtkPanedClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_hpaned_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new) -GtkWidget * gtk_hpaned_new (void); - -G_END_DECLS - -#endif /* __GTK_HPANED_H__ */ diff --git a/gtk/deprecated/gtkhscale.c b/gtk/deprecated/gtkhscale.c deleted file mode 100644 index f5db3c9e55..0000000000 --- a/gtk/deprecated/gtkhscale.c +++ /dev/null @@ -1,141 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include -#include - -#include "gtkhscale.h" - -#include "gtkadjustment.h" -#include "gtkorientable.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkhscale - * @Short_description: A horizontal slider widget for selecting a value from a range - * @Title: GtkHScale - * - * The #GtkHScale widget is used to allow the user to select a value using - * a horizontal slider. To create one, use gtk_hscale_new_with_range(). - * - * The position to show the current value, and the number of decimal places - * shown can be set using the parent #GtkScale class’s functions. - * - * GtkHScale has been deprecated, use #GtkScale instead. - */ - - -G_DEFINE_TYPE (GtkHScale, gtk_hscale, GTK_TYPE_SCALE) - -static void -gtk_hscale_class_init (GtkHScaleClass *class) -{ - GtkRangeClass *range_class = GTK_RANGE_CLASS (class); - - range_class->slider_detail = "hscale"; -} - -static void -gtk_hscale_init (GtkHScale *hscale) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (hscale), - GTK_ORIENTATION_HORIZONTAL); -} - -/** - * gtk_hscale_new: - * @adjustment: (nullable): the #GtkAdjustment which sets the range of - * the scale. - * - * Creates a new #GtkHScale. - * - * Returns: a new #GtkHScale. - * - * Deprecated: 3.2: Use gtk_scale_new() with %GTK_ORIENTATION_HORIZONTAL instead - */ -GtkWidget * -gtk_hscale_new (GtkAdjustment *adjustment) -{ - g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment), - NULL); - - return g_object_new (GTK_TYPE_HSCALE, - "adjustment", adjustment, - NULL); -} - -/** - * gtk_hscale_new_with_range: - * @min: minimum value - * @max: maximum value - * @step: step increment (tick size) used with keyboard shortcuts - * - * Creates a new horizontal scale widget that lets the user input a - * number between @min and @max (including @min and @max) with the - * increment @step. @step must be nonzero; it’s the distance the - * slider moves when using the arrow keys to adjust the scale value. - * - * Note that the way in which the precision is derived works best if @step - * is a power of ten. If the resulting precision is not suitable for your - * needs, use gtk_scale_set_digits() to correct it. - * - * Returns: a new #GtkHScale - * - * Deprecated: 3.2: Use gtk_scale_new_with_range() with %GTK_ORIENTATION_HORIZONTAL instead - **/ -GtkWidget * -gtk_hscale_new_with_range (gdouble min, - gdouble max, - gdouble step) -{ - GtkAdjustment *adj; - GtkScale *scale; - gint digits; - - g_return_val_if_fail (min < max, NULL); - g_return_val_if_fail (step != 0.0, NULL); - - adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0); - - if (fabs (step) >= 1.0 || step == 0.0) - { - digits = 0; - } - else - { - digits = abs ((gint) floor (log10 (fabs (step)))); - if (digits > 5) - digits = 5; - } - - scale = g_object_new (GTK_TYPE_HSCALE, - "adjustment", adj, - "digits", digits, - NULL); - - return GTK_WIDGET (scale); -} diff --git a/gtk/deprecated/gtkhscale.h b/gtk/deprecated/gtkhscale.h deleted file mode 100644 index dee655d40e..0000000000 --- a/gtk/deprecated/gtkhscale.h +++ /dev/null @@ -1,69 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_HSCALE_H__ -#define __GTK_HSCALE_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_HSCALE (gtk_hscale_get_type ()) -#define GTK_HSCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCALE, GtkHScale)) -#define GTK_HSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCALE, GtkHScaleClass)) -#define GTK_IS_HSCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCALE)) -#define GTK_IS_HSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCALE)) -#define GTK_HSCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCALE, GtkHScaleClass)) - - -typedef struct _GtkHScale GtkHScale; -typedef struct _GtkHScaleClass GtkHScaleClass; - -struct _GtkHScale -{ - GtkScale scale; -}; - -struct _GtkHScaleClass -{ - GtkScaleClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_hscale_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new) -GtkWidget* gtk_hscale_new (GtkAdjustment *adjustment); -GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new_with_range) -GtkWidget* gtk_hscale_new_with_range (gdouble min, - gdouble max, - gdouble step); - -G_END_DECLS - -#endif /* __GTK_HSCALE_H__ */ diff --git a/gtk/deprecated/gtkhscrollbar.c b/gtk/deprecated/gtkhscrollbar.c deleted file mode 100644 index d1ec77c1f4..0000000000 --- a/gtk/deprecated/gtkhscrollbar.c +++ /dev/null @@ -1,88 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkhscrollbar.h" - -#include "gtkadjustment.h" -#include "gtkintl.h" -#include "gtkorientable.h" -#include "gtkscrollbar.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkhscrollbar - * @Short_description: A horizontal scrollbar - * @Title: GtkHScrollbar - * @See_also: #GtkScrollbar, #GtkScrolledWindow - * - * The #GtkHScrollbar widget is a widget arranged horizontally creating a - * scrollbar. See #GtkScrollbar for details on - * scrollbars. #GtkAdjustment pointers may be added to handle the - * adjustment of the scrollbar or it may be left %NULL in which case one - * will be created for you. See #GtkScrollbar for a description of what the - * fields in an adjustment represent for a scrollbar. - * - * GtkHScrollbar has been deprecated, use #GtkScrollbar instead. - */ - - -G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR) - -static void -gtk_hscrollbar_class_init (GtkHScrollbarClass *class) -{ - GTK_RANGE_CLASS (class)->stepper_detail = "hscrollbar"; -} - -static void -gtk_hscrollbar_init (GtkHScrollbar *hscrollbar) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (hscrollbar), - GTK_ORIENTATION_HORIZONTAL); -} - -/** - * gtk_hscrollbar_new: - * @adjustment: (allow-none): the #GtkAdjustment to use, or %NULL to create a new adjustment - * - * Creates a new horizontal scrollbar. - * - * Returns: the new #GtkHScrollbar - * - * Deprecated: 3.2: Use gtk_scrollbar_new() with %GTK_ORIENTATION_HORIZONTAL instead - */ -GtkWidget * -gtk_hscrollbar_new (GtkAdjustment *adjustment) -{ - g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment), - NULL); - - return g_object_new (GTK_TYPE_HSCROLLBAR, - "adjustment", adjustment, - NULL); -} diff --git a/gtk/deprecated/gtkhscrollbar.h b/gtk/deprecated/gtkhscrollbar.h deleted file mode 100644 index b529a9bb6f..0000000000 --- a/gtk/deprecated/gtkhscrollbar.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_HSCROLLBAR_H__ -#define __GTK_HSCROLLBAR_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_HSCROLLBAR (gtk_hscrollbar_get_type ()) -#define GTK_HSCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbar)) -#define GTK_HSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass)) -#define GTK_IS_HSCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSCROLLBAR)) -#define GTK_IS_HSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCROLLBAR)) -#define GTK_HSCROLLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass)) - - -typedef struct _GtkHScrollbar GtkHScrollbar; -typedef struct _GtkHScrollbarClass GtkHScrollbarClass; - -struct _GtkHScrollbar -{ - GtkScrollbar scrollbar; -}; - -struct _GtkHScrollbarClass -{ - GtkScrollbarClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_hscrollbar_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new) -GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment); - -G_END_DECLS - -#endif /* __GTK_HSCROLLBAR_H__ */ diff --git a/gtk/deprecated/gtkhseparator.c b/gtk/deprecated/gtkhseparator.c deleted file mode 100644 index 02fa37d7ab..0000000000 --- a/gtk/deprecated/gtkhseparator.c +++ /dev/null @@ -1,78 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkhseparator.h" -#include "gtkorientable.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkhseparator - * @Short_description: A horizontal separator - * @Title: GtkHSeparator - * @See_also: #GtkSeparator - * - * The #GtkHSeparator widget is a horizontal separator, used to group the - * widgets within a window. It displays a horizontal line with a shadow to - * make it appear sunken into the interface. - * - * > The #GtkHSeparator widget is not used as a separator within menus. - * > To create a separator in a menu create an empty #GtkSeparatorMenuItem - * > widget using gtk_separator_menu_item_new() and add it to the menu with - * > gtk_menu_shell_append(). - * - * GtkHSeparator has been deprecated, use #GtkSeparator instead. - */ - - -G_DEFINE_TYPE (GtkHSeparator, gtk_hseparator, GTK_TYPE_SEPARATOR) - -static void -gtk_hseparator_class_init (GtkHSeparatorClass *class) -{ -} - -static void -gtk_hseparator_init (GtkHSeparator *hseparator) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (hseparator), - GTK_ORIENTATION_HORIZONTAL); -} - -/** - * gtk_hseparator_new: - * - * Creates a new #GtkHSeparator. - * - * Returns: a new #GtkHSeparator. - * - * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_HORIZONTAL instead - */ -GtkWidget * -gtk_hseparator_new (void) -{ - return g_object_new (GTK_TYPE_HSEPARATOR, NULL); -} diff --git a/gtk/deprecated/gtkhseparator.h b/gtk/deprecated/gtkhseparator.h deleted file mode 100644 index d1dfcd6308..0000000000 --- a/gtk/deprecated/gtkhseparator.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_HSEPARATOR_H__ -#define __GTK_HSEPARATOR_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_HSEPARATOR (gtk_hseparator_get_type ()) -#define GTK_HSEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator)) -#define GTK_HSEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass)) -#define GTK_IS_HSEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HSEPARATOR)) -#define GTK_IS_HSEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR)) -#define GTK_HSEPARATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass)) - - -typedef struct _GtkHSeparator GtkHSeparator; -typedef struct _GtkHSeparatorClass GtkHSeparatorClass; - -struct _GtkHSeparator -{ - GtkSeparator separator; -}; - -struct _GtkHSeparatorClass -{ - GtkSeparatorClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_hseparator_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new) -GtkWidget* gtk_hseparator_new (void); - -G_END_DECLS - -#endif /* __GTK_HSEPARATOR_H__ */ diff --git a/gtk/deprecated/gtkvbbox.c b/gtk/deprecated/gtkvbbox.c deleted file mode 100644 index 320f84778e..0000000000 --- a/gtk/deprecated/gtkvbbox.c +++ /dev/null @@ -1,87 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkvbbox.h" -#include "gtkorientable.h" -#include "gtkintl.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkvbbox - * @Short_description: A container for arranging buttons vertically - * @Title: GtkVButtonBox - * @See_also: #GtkBox, #GtkButtonBox, #GtkHButtonBox - * - * A button box should be used to provide a consistent layout of buttons - * throughout your application. The layout/spacing can be altered by the - * programmer, or if desired, by the user to alter the “feel” of a - * program to a small degree. - * - * A #GtkVButtonBox is created with gtk_vbutton_box_new(). Buttons are - * packed into a button box the same way widgets are added to any other - * container, using gtk_container_add(). You can also use - * gtk_box_pack_start() or gtk_box_pack_end(), but for button boxes both - * these functions work just like gtk_container_add(), ie., they pack the - * button in a way that depends on the current layout style and on - * whether the button has had gtk_button_box_set_child_secondary() called - * on it. - * - * The spacing between buttons can be set with gtk_box_set_spacing(). The - * arrangement and layout of the buttons can be changed with - * gtk_button_box_set_layout(). - * - * GtkVButtonBox has been deprecated, use #GtkButtonBox instead. - */ - -G_DEFINE_TYPE (GtkVButtonBox, gtk_vbutton_box, GTK_TYPE_BUTTON_BOX) - -static void -gtk_vbutton_box_class_init (GtkVButtonBoxClass *class) -{ -} - -static void -gtk_vbutton_box_init (GtkVButtonBox *vbutton_box) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (vbutton_box), - GTK_ORIENTATION_VERTICAL); -} - -/** - * gtk_vbutton_box_new: - * - * Creates a new vertical button box. - * - * Returns: a new button box #GtkWidget. - * - * Deprecated: 3.2: Use gtk_button_box_new() with %GTK_ORIENTATION_VERTICAL instead - */ -GtkWidget * -gtk_vbutton_box_new (void) -{ - return g_object_new (GTK_TYPE_VBUTTON_BOX, NULL); -} diff --git a/gtk/deprecated/gtkvbbox.h b/gtk/deprecated/gtkvbbox.h deleted file mode 100644 index 96e034eda9..0000000000 --- a/gtk/deprecated/gtkvbbox.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_VBBOX_H__ -#define __GTK_VBBOX_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_VBUTTON_BOX (gtk_vbutton_box_get_type ()) -#define GTK_VBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox)) -#define GTK_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass)) -#define GTK_IS_VBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBUTTON_BOX)) -#define GTK_IS_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX)) -#define GTK_VBUTTON_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass)) - - -typedef struct _GtkVButtonBox GtkVButtonBox; -typedef struct _GtkVButtonBoxClass GtkVButtonBoxClass; - -struct _GtkVButtonBox -{ - GtkButtonBox button_box; -}; - -struct _GtkVButtonBoxClass -{ - GtkButtonBoxClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_vbutton_box_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new) -GtkWidget *gtk_vbutton_box_new (void); - -G_END_DECLS - -#endif /* __GTK_VBBOX_H__ */ diff --git a/gtk/deprecated/gtkvpaned.c b/gtk/deprecated/gtkvpaned.c deleted file mode 100644 index 4a1b8870de..0000000000 --- a/gtk/deprecated/gtkvpaned.c +++ /dev/null @@ -1,73 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkorientable.h" - -#include "gtkvpaned.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkvpaned - * @Short_description: A container with two panes arranged vertically - * @Title: GtkVPaned - * - * The VPaned widget is a container widget with two - * children arranged vertically. The division between - * the two panes is adjustable by the user by dragging - * a handle. See #GtkPaned for details. - * - * GtkVPaned has been deprecated, use #GtkPaned instead. - */ - -G_DEFINE_TYPE (GtkVPaned, gtk_vpaned, GTK_TYPE_PANED) - -static void -gtk_vpaned_class_init (GtkVPanedClass *class) -{ -} - -static void -gtk_vpaned_init (GtkVPaned *vpaned) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (vpaned), - GTK_ORIENTATION_VERTICAL); -} - -/** - * gtk_vpaned_new: - * - * Create a new #GtkVPaned - * - * Returns: the new #GtkVPaned - * - * Deprecated: 3.2: Use gtk_paned_new() with %GTK_ORIENTATION_VERTICAL instead - */ -GtkWidget * -gtk_vpaned_new (void) -{ - return g_object_new (GTK_TYPE_VPANED, NULL); -} diff --git a/gtk/deprecated/gtkvpaned.h b/gtk/deprecated/gtkvpaned.h deleted file mode 100644 index 9437f723e6..0000000000 --- a/gtk/deprecated/gtkvpaned.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_VPANED_H__ -#define __GTK_VPANED_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_VPANED (gtk_vpaned_get_type ()) -#define GTK_VPANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned)) -#define GTK_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass)) -#define GTK_IS_VPANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VPANED)) -#define GTK_IS_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED)) -#define GTK_VPANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass)) - - -typedef struct _GtkVPaned GtkVPaned; -typedef struct _GtkVPanedClass GtkVPanedClass; - -struct _GtkVPaned -{ - GtkPaned paned; -}; - -struct _GtkVPanedClass -{ - GtkPanedClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_vpaned_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new) -GtkWidget * gtk_vpaned_new (void); - -G_END_DECLS - -#endif /* __GTK_VPANED_H__ */ diff --git a/gtk/deprecated/gtkvscale.c b/gtk/deprecated/gtkvscale.c deleted file mode 100644 index 4cbcf5eed4..0000000000 --- a/gtk/deprecated/gtkvscale.c +++ /dev/null @@ -1,138 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include -#include - -#include "gtkvscale.h" - -#include "gtkadjustment.h" -#include "gtkorientable.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkvscale - * @Short_description: A vertical slider widget for selecting a value from a range - * @Title: GtkVScale - * - * The #GtkVScale widget is used to allow the user to select a value using - * a vertical slider. To create one, use gtk_hscale_new_with_range(). - * - * The position to show the current value, and the number of decimal places - * shown can be set using the parent #GtkScale class’s functions. - * - * GtkVScale has been deprecated, use #GtkScale instead. - */ - -G_DEFINE_TYPE (GtkVScale, gtk_vscale, GTK_TYPE_SCALE) - -static void -gtk_vscale_class_init (GtkVScaleClass *class) -{ - GtkRangeClass *range_class = GTK_RANGE_CLASS (class); - - range_class->slider_detail = "vscale"; -} - -static void -gtk_vscale_init (GtkVScale *vscale) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (vscale), - GTK_ORIENTATION_VERTICAL); -} -/** - * gtk_vscale_new: - * @adjustment: the #GtkAdjustment which sets the range of the scale. - * - * Creates a new #GtkVScale. - * - * Returns: a new #GtkVScale. - * - * Deprecated: 3.2: Use gtk_scale_new() with %GTK_ORIENTATION_VERTICAL instead - */ -GtkWidget * -gtk_vscale_new (GtkAdjustment *adjustment) -{ - g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment), - NULL); - - return g_object_new (GTK_TYPE_VSCALE, - "adjustment", adjustment, - NULL); -} - -/** - * gtk_vscale_new_with_range: - * @min: minimum value - * @max: maximum value - * @step: step increment (tick size) used with keyboard shortcuts - * - * Creates a new vertical scale widget that lets the user input a - * number between @min and @max (including @min and @max) with the - * increment @step. @step must be nonzero; it’s the distance the - * slider moves when using the arrow keys to adjust the scale value. - * - * Note that the way in which the precision is derived works best if @step - * is a power of ten. If the resulting precision is not suitable for your - * needs, use gtk_scale_set_digits() to correct it. - * - * Returns: a new #GtkVScale - * - * Deprecated: 3.2: Use gtk_scale_new_with_range() with %GTK_ORIENTATION_VERTICAL instead - **/ -GtkWidget * -gtk_vscale_new_with_range (gdouble min, - gdouble max, - gdouble step) -{ - GtkAdjustment *adj; - GtkScale *scale; - gint digits; - - g_return_val_if_fail (min < max, NULL); - g_return_val_if_fail (step != 0.0, NULL); - - adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0); - - if (fabs (step) >= 1.0 || step == 0.0) - { - digits = 0; - } - else - { - digits = abs ((gint) floor (log10 (fabs (step)))); - if (digits > 5) - digits = 5; - } - - scale = g_object_new (GTK_TYPE_VSCALE, - "adjustment", adj, - "digits", digits, - NULL); - - return GTK_WIDGET (scale); -} diff --git a/gtk/deprecated/gtkvscale.h b/gtk/deprecated/gtkvscale.h deleted file mode 100644 index 180486829e..0000000000 --- a/gtk/deprecated/gtkvscale.h +++ /dev/null @@ -1,75 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_VSCALE_H__ -#define __GTK_VSCALE_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_VSCALE (gtk_vscale_get_type ()) -#define GTK_VSCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCALE, GtkVScale)) -#define GTK_VSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCALE, GtkVScaleClass)) -#define GTK_IS_VSCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCALE)) -#define GTK_IS_VSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCALE)) -#define GTK_VSCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCALE, GtkVScaleClass)) - - -typedef struct _GtkVScale GtkVScale; -typedef struct _GtkVScaleClass GtkVScaleClass; - -/** - * GtkVScale: - * - * The #GtkVScale struct contains private data only, and - * should be accessed using the functions below. - */ -struct _GtkVScale -{ - GtkScale scale; -}; - -struct _GtkVScaleClass -{ - GtkScaleClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_vscale_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new) -GtkWidget* gtk_vscale_new (GtkAdjustment *adjustment); -GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new_with_range) -GtkWidget* gtk_vscale_new_with_range (gdouble min, - gdouble max, - gdouble step); - -G_END_DECLS - -#endif /* __GTK_VSCALE_H__ */ diff --git a/gtk/deprecated/gtkvscrollbar.c b/gtk/deprecated/gtkvscrollbar.c deleted file mode 100644 index 274a3ce320..0000000000 --- a/gtk/deprecated/gtkvscrollbar.c +++ /dev/null @@ -1,87 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkvscrollbar.h" - -#include "gtkadjustment.h" -#include "gtkintl.h" -#include "gtkorientable.h" -#include "gtkscrollbar.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkvscrollbar - * @Short_description: A vertical scrollbar - * @Title: GtkVScrollbar - * @See_also:#GtkScrollbar, #GtkScrolledWindow - * - * The #GtkVScrollbar widget is a widget arranged vertically creating a - * scrollbar. See #GtkScrollbar for details on - * scrollbars. #GtkAdjustment pointers may be added to handle the - * adjustment of the scrollbar or it may be left %NULL in which case one - * will be created for you. See #GtkScrollbar for a description of what the - * fields in an adjustment represent for a scrollbar. - * - * GtkVScrollbar has been deprecated, use #GtkScrollbar instead. - */ - -G_DEFINE_TYPE (GtkVScrollbar, gtk_vscrollbar, GTK_TYPE_SCROLLBAR) - -static void -gtk_vscrollbar_class_init (GtkVScrollbarClass *class) -{ - GTK_RANGE_CLASS (class)->stepper_detail = "vscrollbar"; -} - -static void -gtk_vscrollbar_init (GtkVScrollbar *vscrollbar) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (vscrollbar), - GTK_ORIENTATION_VERTICAL); -} - -/** - * gtk_vscrollbar_new: - * @adjustment: (allow-none): the #GtkAdjustment to use, or %NULL to create a new adjustment - * - * Creates a new vertical scrollbar. - * - * Returns: the new #GtkVScrollbar - * - * Deprecated: 3.2: Use gtk_scrollbar_new() with %GTK_ORIENTATION_VERTICAL instead - */ -GtkWidget * -gtk_vscrollbar_new (GtkAdjustment *adjustment) -{ - g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment), - NULL); - - return g_object_new (GTK_TYPE_VSCROLLBAR, - "adjustment", adjustment, - NULL); -} diff --git a/gtk/deprecated/gtkvscrollbar.h b/gtk/deprecated/gtkvscrollbar.h deleted file mode 100644 index 56b6f3fa8f..0000000000 --- a/gtk/deprecated/gtkvscrollbar.h +++ /dev/null @@ -1,71 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_VSCROLLBAR_H__ -#define __GTK_VSCROLLBAR_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_VSCROLLBAR (gtk_vscrollbar_get_type ()) -#define GTK_VSCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbar)) -#define GTK_VSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass)) -#define GTK_IS_VSCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSCROLLBAR)) -#define GTK_IS_VSCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBAR)) -#define GTK_VSCROLLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass)) - - -typedef struct _GtkVScrollbar GtkVScrollbar; -typedef struct _GtkVScrollbarClass GtkVScrollbarClass; - -/** - * GtkVScrollbar: - * - * The #GtkVScrollbar struct contains private data and should be accessed - * using the functions below. - */ -struct _GtkVScrollbar -{ - GtkScrollbar scrollbar; -}; - -struct _GtkVScrollbarClass -{ - GtkScrollbarClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_vscrollbar_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new) -GtkWidget* gtk_vscrollbar_new (GtkAdjustment *adjustment); - -G_END_DECLS - -#endif /* __GTK_VSCROLLBAR_H__ */ diff --git a/gtk/deprecated/gtkvseparator.c b/gtk/deprecated/gtkvseparator.c deleted file mode 100644 index c297fa5dda..0000000000 --- a/gtk/deprecated/gtkvseparator.c +++ /dev/null @@ -1,73 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#include "gtkorientable.h" - -#include "gtkvseparator.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkvseparator - * @Short_description: A vertical separator - * @Title: GtkVSeparator - * @See_also: #GtkHSeparator - * - * The #GtkVSeparator widget is a vertical separator, used to group the - * widgets within a window. It displays a vertical line with a shadow to - * make it appear sunken into the interface. - * - * GtkVSeparator has been deprecated, use #GtkSeparator instead. - */ - -G_DEFINE_TYPE (GtkVSeparator, gtk_vseparator, GTK_TYPE_SEPARATOR) - -static void -gtk_vseparator_class_init (GtkVSeparatorClass *klass) -{ -} - -static void -gtk_vseparator_init (GtkVSeparator *vseparator) -{ - gtk_orientable_set_orientation (GTK_ORIENTABLE (vseparator), - GTK_ORIENTATION_VERTICAL); -} - -/** - * gtk_vseparator_new: - * - * Creates a new #GtkVSeparator. - * - * Returns: a new #GtkVSeparator. - * - * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_VERTICAL instead - */ -GtkWidget * -gtk_vseparator_new (void) -{ - return g_object_new (GTK_TYPE_VSEPARATOR, NULL); -} diff --git a/gtk/deprecated/gtkvseparator.h b/gtk/deprecated/gtkvseparator.h deleted file mode 100644 index 3b18145202..0000000000 --- a/gtk/deprecated/gtkvseparator.h +++ /dev/null @@ -1,71 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_VSEPARATOR_H__ -#define __GTK_VSEPARATOR_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_VSEPARATOR (gtk_vseparator_get_type ()) -#define GTK_VSEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator)) -#define GTK_VSEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass)) -#define GTK_IS_VSEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VSEPARATOR)) -#define GTK_IS_VSEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR)) -#define GTK_VSEPARATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass)) - - -typedef struct _GtkVSeparator GtkVSeparator; -typedef struct _GtkVSeparatorClass GtkVSeparatorClass; - -/** - * GtkVSeparator: - * - * The #GtkVSeparator struct contains private data only, and - * should be accessed using the functions below. - */ -struct _GtkVSeparator -{ - GtkSeparator separator; -}; - -struct _GtkVSeparatorClass -{ - GtkSeparatorClass parent_class; -}; - - -GDK_DEPRECATED_IN_3_2 -GType gtk_vseparator_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new) -GtkWidget* gtk_vseparator_new (void); - -G_END_DECLS - -#endif /* __GTK_VSEPARATOR_H__ */ diff --git a/gtk/gtk.h b/gtk/gtk.h index be4d72e47b..d4d882960e 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -249,12 +249,7 @@ #include #include #include -#include -#include #include -#include -#include -#include #include #include #include @@ -265,12 +260,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include #endif /* GTK_DISABLE_DEPRECATED */ #include diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index fa54f96480..96a37e6371 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -91,7 +91,7 @@ test_parser (void) g_error_free (error); error = NULL; - gtk_builder_add_from_string (builder, "", -1, &error); + gtk_builder_add_from_string (builder, "", -1, &error); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_TAG); g_error_free (error); @@ -439,7 +439,8 @@ test_sizegroup (void) " " " " " " - " " + " " + " vertical" " " " " " " @@ -476,7 +477,8 @@ test_sizegroup (void) " " " " " " - " " + " " + " vertical" " " " " " " @@ -722,11 +724,6 @@ test_types (void) " " " " " " - " " - " " - " " - " " - " " " " " " " " @@ -745,13 +742,7 @@ test_types (void) " " " " " " - " " - " " - " " - " " " " - " " - " " " " " " ""; @@ -929,7 +920,8 @@ test_object_properties (void) "" " " " " - " " + " " + " vertical" " 10" " " " " @@ -985,11 +977,13 @@ test_children (void) " " " 1" " " - " " + " " + " vertical" " 10" " " - " " + " " " 20" + " horizontal" " " " " " " @@ -1414,9 +1408,11 @@ test_dialog (void) "" " " " " - " " + " " + " vertical" " " - " " + " " + " horizontal" " " " " " " @@ -1457,7 +1453,8 @@ test_message_dialog (void) "" " " " " - " " + " " + " vertical" " " " " " " @@ -1564,7 +1561,8 @@ test_widget (void) "" " " " " - " " + " " + " vertical" " " " " " " @@ -1830,7 +1828,8 @@ test_reference_counting (void) ""; const gchar buffer2[] = "" - " " + " " + " vertical" " " " " " " @@ -2080,7 +2079,8 @@ test_add_objects (void) "" " " " " - " " + " " + " vertical" " True" " " " " @@ -2249,7 +2249,7 @@ test_menus (void) " " " " " " - " " + " " " True" " vertical" " " @@ -2288,7 +2288,7 @@ test_menus (void) " " " " " " - " " + " " " True" " vertical" " " @@ -2408,7 +2408,8 @@ test_message_area (void) " " " " " " - " " + " " + " vertical" " " " " " gtk-ok" @@ -2650,7 +2651,8 @@ test_no_ids (void) " " " " " " - " " + " " + " vertical" " " " " " gtk-ok" @@ -2681,7 +2683,7 @@ test_property_bindings (void) "" " " " " - " " + " " " True" " vertical" " " -- 2.30.2